merge trunk
authorK. Handa <handa@gnu.org>
Thu, 23 May 2013 12:04:26 +0000 (21:04 +0900)
committerK. Handa <handa@gnu.org>
Thu, 23 May 2013 12:04:26 +0000 (21:04 +0900)

Trivial merge